New file structure and updtated single pages