Re-organized everything into a better directory structure.