Class names changed. More work on editing module..

Still incomplete