Massive file reformate and cleanup

Trust me you need this and it will make life easier.