Cleanup of leftover files from previous commit, these have now been moved to the lib and spec dirs