Restructuring my repo