Removed unused imports from project file.
Started refactoring mostly in error.core.