[no-ticket] organized folder structure