Updated some classes

Updated some classes and restructured the ActionScript

Signed-off-by: Tyler Janca <tejanca@ccwip.net>