Simplified the file structure a bit and trimmed off some fat.