implements page name fix - fixes #16

also re-organizes application structure