Moved into Koala namespace
Fixed namespaces
Removed out-dated comment
Optimized imports
Merge branch 'namespacing' into dev