restructure base project