Restructure project folders