Move application files into application folder
More style fixes