fixed #1; removed old files