Moved web application to a seperate folder
Enhanced subscription handling