Added LevelCounter test and fixed issues uncovered

also restructured file system