cleaned up source files and seperated demo stuff