Next push, big reorder and cleanup

Reordered the files again and proceded with building the thing, getting
the hang of it now.