Project nazi: bring everything down a directory layer
Project nazi: remove redundant directory name prefix