Updating gemspec format
Cleaning up directory structure