Started work refactoring application folder