refactor to utilize "Angular Best Practice for App Structure