Fix spec file hierarchy