Directory cleanup/restructure

Signed-off-by: Jeremy McSpadden <jeremy@fluxlabs.net>