Redefine structure app: remove unused files
Redefine structure app: add new files. Extrated from main control