Removed deprecated files
Separated get data from page entity