Moving classes into "lib" folder