Structure shuffle, better naming convention and page layout options. Changed class names and nabvigation names to better names