reformating dir structure and adding basic_math