Organize classes into new package structure