Big changes on packages, classes and new file tree.