Organization and documentation
One file was too large