Removed warnings, renamed files temporarily