Move to a better file structure for Angular