Changes to the core abstract classes, deleted unused module directory, form updates
Resolved merge conflict