Move `lib` directory
Add & Modify specs