more renaming and improving make file