support for custom folders and better indentation