moved a few files to proper packages