Refactoring, changed Organization, added simple feedback analyser