Removed unnecessary class and improved routing system.