Updated path structure for database, added folders