added new files, changed directory structure