updated to remove return char, moved one file to organizational