Made folder structure changes & authentication works