Branch to break out lib and data dirs
starting to reconfigure structure
moved classes to lib