Moved data to separate files