Moved headers, added page struct