Moved some files around into better folder organization