Swift update to 4.2 and other improvements

Improvements and resolved issues:

• Changed project structure to allow easier dependency update
• Updated code to use Swift 4.2 and Xcode 10
• #76: Keep code comments
• Other minor updates and fixes