Fix/cleanup folders

The migration was there, but for some reason (probably MR with it was added after publication and it added to already released version) So, added it this time to the next version