added folder integration for propper filing