rearranged file locations
boxselect
highlighter
rearranged namespaces/dependencies