Seperate the web app and make it clean