Compilation - Converted to a better makefile organization