Remove unneeded imports
Move SimpleMap to serialization package
Remove SimpleMap import
Remove SimpleMap import
Update SimpleMap package
Spacing cleanup