Removed Toasts, Changed filename format,

Added subdirectories.