Ant added and major refactor