split files up a bit more logically