Restructured directories a little.