Major file restructure
Updated gitignore
Merge branch 'develop' of https://github.com/nhandyal/scia into develop
Abort finish, begin emergency hack for GM
Merge branch 'develop' of https://github.com/nhandyal/scia into develop