moved code, deleted unused modules, fixed references to renamed modules