Some minor refactoring
Removed A* to different module.