Moved modules to contrib and custom folders.