moved around some files into lib folder