Restructure

Task and database structure changed