Fixed packaging naming and removed some files