re-organized directory