Package clean up

* Moved all logical plans into their own package
* Moved the steps package into the logical package