Setup include structure
Updated include list