Organize project structure a bit for sanity