Rearranging files for better project organization