Moves some files around.
Attempted to implement PHI support and slightly better looking output