change dir structure to be more moz IT friendly