move files into lib directory and update requires