Refactor/simplify folder locations.