Restructure project folder