Moved data to models folder and set up linking