UPDATE: Reoganize Files for terminal friendliness