Updated with save function, removed unnused files.