Some trash enhancement. Stripped unused data from folder/file-list
Added move functions and fixed some bugs