Rebased the global files to the main dir