Reorganized file structures and refactored angular controllers