Split files better

[ohnx]

need to split the files into better divisions...

[ohnx]

Not relevant when re-make happens.

[ohnx]

Still is a problem in the new version - significant amounts of code were copied from the old version (more than initially expected)