Added Multi-Folder feature

Plus some bug fixes and additions