move to new dir based on context

move to a new directory in order to highlight and improve organization
based on context