getting file organization correct...