Rearrange directory and convert to package

Signed-off-by: Matthew Dahmer <matthew.dahmer@gmail.com>