Preparing proper packaging
Correcting imports.