Beta

Reorganization of the package with new requirements.