Change all data to module structure
Changed structure everywhere but in script
Basic functioning module support