Reordered repository, deleted unnecesary extra Macaya folder