Restructure modules
Remove double quotes