Build: move things around and clean-up
Build: move things around and clean-up

orbeon/orbeon-forms,brunobuzzi/orbeon-forms,brunobuzzi/orbeon-forms,orbeon/orbeon-forms,brunobuzzi/orbeon-forms,brunobuzzi/orbeon-forms,orbeon/orbeon-forms,orbeon/orbeon-forms