Directory structure modified. Some minor changes.