Moved files to lib/ folder. More logical