Cleanup + move angular files to own directories