package structure reorg
fix autoloader for debug