Reorganize directories, separated data structures from algorithms