improved factories
fixed file writing, converted Calendar to Date
update
added internal json to note
Merge pull request #3 from Lesterrific17/master

I have named the components/variables properly
Moved image icons to another package
added icons to some buttons
Merge upstream/master