changed dependencies and directory layout
removed unused dependencies