move modules to correct folder
add locale support