Moved lib files to their own folder for cleaner file structure