restructured some folders