reverted back to lib/ folder structure