Modified code layout. ver 0.1.2