Fixed Include Structure

Fixed the include structure to make it conform with the rest of the
astateful projects.