Fixed packaging (makefiles were wrong)