Stripped down template and general reorganization