Removing all page file, folded into main classes instead