Rename and move files for better modularization.