#2 Major reorganization
#2 Temporary bandaid patch for Travis