moved everything implementation related to the new directory  for a cleaner directory structure; everything seems to work