Restructured the application and test project