reorganize/rename andy\'s source