removed some files, added modules