project reorganization

moving things around again