rearranging the clean project -wip