More easy challenges and changed dir structure