Fixing tons of stuff, refactoring and creating master build & example scripts.
Fixing merge conflicts.