Starting to have some package structure...
Reorganization in package and subpackages.