Added apache cli dependency and cleaned up project