Refactored the file structure a bit.