change includes file structure