Moving classes due a ciclic dependency between the projects. FIxing other minor issues