Moved source files to lib and header files to include as per Buck's requrest