restructured folders and moved wat