Further changes to file structure
Further architecture tweaks