restructure tasks to follow PSR-0 standards