Directory structure overhaul for unit testing happiness