cleaning up project organization