Removed infra/
Cleanup and refactoring of Makefiles