Updates and New pages

Changes on the classes and structure design