changed back to original dir structure