moved some files around
added stuff for output