restructured files, created first failing test, made it pass