Modified file structure. Added full tasks functionality