One step closer to split in multiple files thingy!

But still not working...