moved things to seperate directories