Merge pull request #2 from sid24ss/master

HeuristicMgr
cleaned up some formatting, renamed baseheuristic
moved heuristic files into their own folders
got rid of unneeded includes