Project reorganzation
Fix #203