Updated application directory structure
Merge origin/master
Removed old package