Almost there

Signed-off-by: Chad Allen <chad@awsmlabs.com>
UPdates and moving directories

Signed-off-by: Chad Allen <chad@awsmlabs.com>