Updated ignore
Split classes into individual files
Move class definitions to cpp files
Merge branch 'develop'