Moved static version and socket version to their own dirs