Restructure project and includes