Refactoring - moved library files to a lib folder