Implementation of controllers, updated repositories and some renames