Refactoring name and file layouts, updating tests.
Working on handling note attachments.