Organized Impl

https://github.com/kfgodel/diamond/issues/84