Moved away from 3 files for entire app