0.1
Cleanup and renaming