Clean up include directives
Move lib to src
Move public headers to separate include directory