Removed unnecessary classes and added elements that were in CodeFramework