More structure reorganizing and some additional features added.