Moved libraries and added Apache CLI