Code clean up
Re-organized some code into new packages. Looks nicer.