Perlification of the package structure
Cleaning up form the perlification