Moving 1 file into several files. Removed some unused imports.