revamping files structure