Organize files in module structure