added generator and solver to top level, updated code commenting