re-structure angular app modules to comply to angular structure