- changed the dir name
- refactored app.'s for both apps