much better file scheme now