Fix path problem. update gitignore reflect to new directory structure