Changing the architecture
Everything appears to be working with the new architecture
Minor tweaks