project restructure for cleanup purposes