Refactoring
Moving amalgamation to the root