Apply new directory structure, add testing frame