Adding new configuration
Updating Structure
Updating to modulize components
Adding missing elements