reorganized repository a bit