[dirty] project reorganization