fix file structure
fix structure
make it working again