Cleaned up file layouts. Moved the main methods out of the actual class implementations