Changed system structure, added empty demo page