adjust angular code and file structure to match best practices