Added test project, changed layout