moving to a more standard file layout