2010-08-29 cli Add some checks to prevent #13 happen.
2010-08-29 cli Moving source files into src/-subdir.