Application Restructured
Refactoring: moving new files to new branch