Rearranging code with new files