Fix build errors, due to moving main.
Merge pull request #188 from dankurka/move_main

Fix build errors, due to moving main.