removed confusing directory names, the code will be self documenting