changed package structure of data preparation
made persistence test work for one-to-many relationships