Move files to prepare a proper packaging
Fix few structure downsides