Refactoring. Add applications to apps directory