Reworked file structure a little.