Moved files into lib subdir

Signed-off-by: Michael Greenhill <doctorjbeam@gmail.com>