Cleaning up directory structure and adding in JSDoc comments