Restructuring projects in lib and webapp