structure: moved to simple module directories