Cleanup

Let's do some house cleaning ...

* Clean up the cameo namespace by using __all___
* Make all file headers consistent
* Move hackish methods to stuff