Updated to new dir structure