Clean Up includes/actions code and classes

Splits classes into individual files
Clean up comments

Change-Id: Ie5c3942f70019b6556df19cba1e2a4bf37698531
Merge "Clean Up includes/actions code and classes"