Removed redundant app and reorganized code
Commit files that were forgettin in the last commit