File move and fixes