Add acknowledgement, cleanup, update folders
Cleanup