Moved everything from simple to root folder, and removed all previous
work.  Reved everything at branch revA for previous work, all new work
will be done in root directory