simplified the dir structure some