Move all inclues to separate dir