Rearranged CK+ repository