Changed to relative imports, cleaned up