reorganized directory structurey