clean up the code and rearranged folders