Renamed some tasks and added packaging