added some files and moved some things