minor code cleanup
package organization experiment
code cleanup
package restructure