renames and restructured dir