Updates 24102013

In this commit we have some fix, and reorganization of source.