Clean up

Clean up files, and organize images