Added a class-loader file, moved options class to its own file