Refactor include structure