Updated File structure

name change and relocation to a more sensible structure.