Fixed make directories
Fixed add prefix errors
Cleanup
Updated makefiles