Cleaned up and made into seperated files

Signed-off-by: C5E3B7BD (Will Apodaca) <C5E3B7BD@gmail.com>
Fixed some errors and the handler files showing up on the intellisense results

Signed-off-by: C5E3B7BD (Will Apodaca) <C5E3B7BD@gmail.com>