Restructuring modules directory.