The Big Refactoring is begins... The Evil is coming