Updated to add CLI options and cleaned up structure.