Major restructure and architecture update

This is an important step towards reaching 0.8