Some rearranging and junk removal
Currently in a functional state with the new packaging layout