Reduced the core functionality into one repository