Removed obsolete files, cleaned up file locations and content.