Refactored App controllers added and models added to app