Moving modules to contrib and custom directories
Adding GR Features.
adding features extra and dependencies.