New organization and bugfixing