Removed dist spec packaging folder from main source tree
Corrected spec and changes file names