Update submodules
Cleanup

Move all mod declarations to main.rs
Update StrBuf->String
Change all ~str to String