Rename module files for better organization