Reorganized Code to better separate what is general, what is specifically Alavi and what is specifically TIP4P