Reorder in dist and src folder