some cleanup and also commiting new class files as per last meeting discussion

the newly added files are still empty, just a place holder for now, we
will have to fill them