Fixed all parsing errors

Added folder column as well.