Moved classes into new packages to help distinguish separate parts.
Fixed bug with work/machine coordinates being swapped. Fixes #51