Moved some enums and interfaces.