Fix includes and change include structure to be modular