Refactor; trim down subdirectories a bit