Isolate S3 a bit better
Move Import HDFS away from start-up to load time
Move class load stuff to a separate file