Huge change to structure.
Merge branch 'develop' of github.com:SHSTuring/norewar into develop