Cleanup: Remove dirs that are no longer present in structure from makefile