Cleaned up database branch into folders