removed old files
updated for new directory structure