Edited the Configuration files and class names