Switched to _more standard_ directory structure.