further working on authentication, reorganizing project