refactored folder's structure
refactored apps structure. fixed tests