Completed attaching file to a task. Restructure files. Fix bugs