package refactoring again

-- unwanted changes had to be reverted
-- note and attachment files have earned their own packages for now