restructured the files so the tasks are better devided