moved files to lib folder for cleaner access