Converting file structure to requested structure

Signed-off-by: T.J. Moats <toadking2@gmail.com>