new data structure, properties file changed.
Little reorganization in general idea about application.