changed folder structure, also trying out a loading indication idea