[DEV] update the main structure of the application