MOD: shorten the package (removed unused files)