Moving modules into contrib and custom directories