Cleaned up package structure /cc @jbeemster