Revert "Merge branch 'temp'"

This reverts commit 276c82d7bcaf3183fc0e675b99ef044751561718, reversing
changes made to 3a32c4dd19d3ecbfcc59a69f7a488a217425168c.
Fixed active tab section not working.
Separate out controllers and services from app monolith file.