rearranged directory strucutre, added with statement handling for Accessor class