New structure as preparation for routing and proper usage of factory added as well as Flat UI and bootstrap resources