changed directory structure and worked on tests