Changed organization scheme again.

Just personal preference