re-organized dirs