Updated default paths to match makefile structure