remove pagnation
tidy up, change folder stucture, log issues