Merged files to make some module structure