Refactor test app dir structure