Heuristic scanning alpha (nonfunctional)
Reorganized and renamed files for branch