Refactoring: division into different modules
No more AppCache
Change service module