checkpoint - major refactoring of directory structure