condensing stuff.

reducing the amount of files, but correctly modular.