Overall re-structure

Made changes to project structure.