File Structure

Changed the file structure a bit to add some new gleanings.