Refactoring directories and adding USAGE.