removing utils module, because it was stupid. Also moving files around to correct locations