Directory refactor to match jasmine naming conventions