Moving files around to make it all mor undestandable, naming
the beast.