Remove unnecessary branch, and handle non-canonical directory
Remove unnecessary branch, and handle non-canonical directory

circleci/frontend,prathamesh-sonpatki/frontend,RayRutjes/frontend,prathamesh-sonpatki/frontend,circleci/frontend,RayRutjes/frontend,circleci/frontend