Refactor application file structure
Fixed file refactoring issues