changed the way filenames are handled across project..
added new goal..