Cleaned up dir structure and wrote gemspec file