Spec and Makefile changes

Changes spec file and Makefile to reflect changes in the code structure. Removes unused init script