Removed old files, adapted rules