Basic housecleaning; also, trying to add an OO model for projects with rules