File structure and code changed to match OpenWebApp template (working on B2G)