changed classes, files and ids, created hierarchy.