switch to more gem-like dir structure.