Moving Files for new structure