Edited Makefiles and corrected repo structure