makefiles, new src structure, name comfliction solution