moved some source files out of the include directory to the src directory