Refactoring of spec file structure #27

I've changed the spec file structure, merge please