Organize things into more packages.
Ignore main and test bins