refactor(app wide): Overall restructure of files
Merge branch 'master' into feature-new_command