project restructuring
clean up