Refactored app module files