Restructured project
Fixed problems caused by restructure