Restructuring and adding 2 demo web apps