Re-orged files into project folders