Restructure project directory