Moved everything under lib