Added Test-Framework; Relocated resources