Moved some files around
Program handles files better