Reorganize. Separate entities into own files