Gear and Conversions

Some things went awry, rolled back and now fixed again
Merge branch 'Project-folder' of https://github.com/Pingli/PjBackToBasics into Project-folder