Code cleaning (Deleted old file), Changed Project struture