cleanup, move resources locations, and workaround the infinite login problem