moved things to proper dirs