Rearrange File Structure

Flattening File structure