Directory structure slightly reorganzied.