reorganized everything under crystal
rewriting! not done yet