Fixed includes and properly generated dist directory.