Reorganizate repo