Layout setup and angular app reorganization