Moved, renamed, and started to clean up the mess

Signed-off-by: Captain Shadows <captain_shadows@aol.com>