start adding authenticor + file structure changes