Moves many things all over the place.

Tried to organise project.