added new files
removed unused code