Performance Part moved to module, Refactoring and bugfixing