Removed old, deprecated files. Changed name of main file