Code clean up (obsolete files and wrong locations).