commit after consolodating file locations