Start repo reworking