Finished second analysis and restructured directores (again)