Refactor of base class

Project moved into folder, Base class moved into folder.