File structure changes.

Signed-off-by: Blake-C <Blake@DigitalBlake.com>