Most refactoring is done. The import statements are still being copied and pasted..need to improve that.