Files restructuring and working on email sending