Restructure and Rename files for clarity.