Cleaned up and broke apart the demos