Hacks to make things work better. Removing makefiles