- Moved code of separate concerns into their own files