Refactoring project after an critical error.