Restructured directories close #101