Recovered from old repository. Restructured projet dir hierarchy