cleanup and refactoring...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
split off file and localstorage handling...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>