Re-organized directory structure; fixed include order consistency