restruct package
remove spaceless extension