Second update

New directory configuration.
New classes.