Move files around/
Fix build errors.
Add boolean generation.