Restructure of repo

Changed the structure of the repo to represent project structure