Moving things around, minor cleanup
Add missing dependency to the executable build