Rearranging file structure, adding script