fix file organization
fix conflicts