migrations; fix structure