renamed files and added delegate methods
removed old files