Fixing makefiles and configs and move around files