Included progress bar, moved content to different files