more re-org, plus fixing of sidebar to work with angular and includes