Add SConstruct
Cleanup a bit