better code structure in includes