renamed some file and clened up
added max page limiter