Rearrange file structure for better organization