Repo and SPEC file restructured